added client side search