Fixed LocationController refactoring

Closes #17