the first term is no longer the original term

instead of scapping the first one go throught the list and try to find
the original search term
also minor codestyle fixes
update test data

actually still two tests fail, but that is because
composite terms are no longer correctly detected