GRAS-1343 some updates and fixes to validation and number plugin