Handle more tag variations correctly in major_minor function