Badge fix vol.2 + typeahead URL change