intermediate commit

fixed bug on cancel, autocomplete for brand