Bug fix for search features and languages