SPDIII-91 Query changes