Fix Search Handler return type bug