Undo a change in the notification code that was buggy
Extract code to find best match from an iteration
Fall back to scanning whole bookmark tree if no hits