Fix for #2328 - Adding check for title and if it exists using this for title