Fixed messed up form fields while using 'only' / 'exclude'