wrap query interpretation, almost there