correct swicth description
additional safety check
no need for routes changes