[IMP] Move check in switch to top

- Hide disabled fields