Better location list management