Small Query Changes