wip -  adding server side filtering