MA: Update title xpath, tighten up code.