Better location handling (remix by Datenanalyst David)