fixed bug on keywords handling