Fixed issue with concurrent registration and search