fixed pagination and map behaviors