remove query from non-market version