Updated search component