Initial client side filtering working