User Search fix