CBX-35 - Fix notEmpty validation