added checks for manuel location entry