UI - usage of switch instead of true false #719