changed order of feature and search