Fix the handler names and make typeahead more customizable