Improve behaviour when user manually changes location field