Added escaping for list view