* Fix performance issues with client side filtering