Fix bug with the new root services speedup
Base work for event typeahead