Allow Locations to get displayed as Feature Layers & use this for
OCHAROCCA
Cleanups found using debugger hints: remove unused vars, a few fixes