Replaced underline hack with bold highlighting in the bookmark search
In addition, refactored and simplified bookmark search code, added debug output and comments.