Fixing broken language indexing in com_finder

Fixes #5352

Please see the above mentioned issue for further discussion