AUTO-613 and white space trimming for all the keywords fields

fix for AUTO-613