ExpertSearch fix