Small Refactor, Select Location Bar Fix