Handle SMMS generated views better