Fixed references to drawing title and id