refactoring, try to have only one collection and typeahead for forms