Fixes #2. Moved Location Properties above Locations of Interest