Removed over-localized queries.
#MBL-10484 In Progress