Query shape

parse query feature @imlucas