Cleanup searching bookmarks list box (resubmitted)

Adds the changes from !1592 (merged) to the list box used for searching.

Resubmitted because the changes from the original PR (!1595 (merged)) were accidentally reverted in another PR.

Note: this does cause #2406 (closed) to also happen with the searching list box, but it might just be better to keep the list boxes consistent.