fixes + basic search option.