[Anil/Mihir] fixed load more