Improve #location= readability in location handler