#621 Fixed switching of layout with options values; created extender for boolean input;