improve checks of fields and enabling of apply buttons