Fixed switching filtering
1.1 release
Update restrictions
Remove unneeded checks