Refactor filters and page requests types