add fixes for title population