properly clean up stored locators before querying.