Better location handling (snippets update)