Added the ability save filter type switch
Added the ability to filter based off on last switch