Removed legacy use of pageable Issues/22

Please review and merge if all OK #22