Add fix for user search missing some results