fixed white space issue in keyword matching