Revert "Fixed Query Failed when no tag is set"

This reverts commit c321bc72e97782b5cbf248889d66440ed76caa0b.