add titles, better support for override lang