Locations Index Reworked