Location drafts: Update ContentViewHelper to correctly return draft location