updating validations to ignore empty and undefined