Add paginate and reduce filter space