Switched to tracking #search-metadata and #query-metadata for stats.