location query fixes
location query fixes