Updated search element accordingly to reviewer notes