Replaced underline hack with bold highlighting in the bookmark search

Authored by nmel on Mar 16 2018, 8:53 AM.

Description

Replaced underline hack with bold highlighting in the bookmark search

In addition, refactored and simplified bookmark search code,
added debug output and comments.