Fixed a bug with more than a page full of entities