Added better title matching