#5: adjust overriding query