Attempt to fix broken data_search autocomplete