add a formatting option to resource:list
merge upstream changes