Feature/855 missing pagination