client side searching/filtering fixes2