fix stuck loading and infinite pagination for maps