Refactor to use search helper