Moved highlighting from solar to Drupal

Removed hl from solar query and added logic to all domain templates for
highlighting.