Add more popular queries and fix some overrides.