Fixed 'not_empty' validation, #678 and #625