d3-2 adjustments
optimize typeahead query