Fix no entities remaining on the page