Add ugly client side filtering