Fixed Query Failed when no tag is set