Fixed multi-language search (hopefully)