Improved replying to comments
Merge commit '07e487bee67756e810ea9dbec0c58c54d94a2fd8' into favoritesRefactor
Added more verbose support for locations