fix tag query