+ basic filter switch added