Restore the original indicator names
Update query_search to work with the v2 api