Fixing broken language indexing in com_finder

Fixes #5352

Please see the above mentioned issue for further discussion
Fixing Unittests.
Comment-fix
Merge pull request #5364 from Hackwar/patch-16

Fixing broken language indexing in com_finder