Do not boost combinations, but categories.
Fix specs, which incidentally, feel more correct.