Fixes for issues that prevented Finding pagination to work properly

Fixes are trivial and so further explanations are probably not needed :)