Reworked attribute match boosting. All tests pass.