Normalize titles better

Change-Id: I57c8b775c910cc46114db63654f4a61d00fe8d4a