Bug 843547 - Only loading search when needed