Also added menu check to tag module queries