TRUNK-4424 Score shorter matches higher