Adding usage inputs
Fixed typeahead scope