Keep old search interface