Updated filter and paginator, new dependencies