Remove redundant tokenizer.
Add keywords (extra searchwords) to services also.
Index text and extra searchwords into separate fields.

Add extra searchwords to service index also.