Genericise more search components