Lots of fix up for title matching.