Added filtering from client side.