The tagnames in the fields are used in the controller so this would be a substantial amount of reworking! 

Fixed the reject fields!