Add client pagination and filter. TODO: filter fail