enhancing query model