Complete location pagination #47
Pagination remain to be tested #47