Improve Search results highlighting

- remove unnecessary code
- use keyed Tag with a well known App key for preventing collisions
- fix missing Brightness Level preference key (used for highlight)

Change-Id: Ib856cc33f9058c10303d239e60a0ee4c322385a1