fix pagination, unittests and add some filters