fixed conditions to ignore intensity if 'none' is the value