remove feature 'switch'
use -attr again
code style fixes