Updated notEmpty validation to better match