Cleanup, fix global search suggestions.