Tweak from if to elseif for new filters