query shape fixes