Bugfixes and fixed pagination issues