10 - Refactored Search
11 - Internationalization