Main tag switch and SASS fixes