Fix and refactor comparator.

- Absence of availabilityClass broke comparator.
- Use string concatenation to make title + sub_title comparison simpler.