Fixed to use search option.