Slight bug fixes to data validation for text and numbers
Merge remote-tracking branch 'origin'