Bug 1104139 - [Contacts] Refactor highlight so we can avoid using regexp (WIP)

Unless you currently have an explicit need to change the highlight currently, please drop this argument. I think for now using the ```highlight``` class is fine, if we need to not collide in the future we can change it in one place.