+ Some bugfixes for search, subscriptions