adjust overriding query