feat($location): test $location enhancements from #6421 and fix them

This is temporary