Fix forcing wildcard in query analyzer