LUN-792 More improvements: reduce the number of title queries

* also fix most of the unit tests (some are still failing)