Noti fix merge

Merge of both the notiFix branch and your tagging work. Contains a fix for bookmarks failing on special character searches.