acu178811 Amendment to previous commit, always nil check tags query