location validation improved