Enabled other types of location query, + cleanup.