added query builder and locator entries