CDB-877 #fixes Fixes a bug that prevented paginating