Add support to filtering to both client and server