Fix handling of content URIs and tidy up toast strings