BUGFIX prevent updatecmsfields from running twice on BlockSiteTreeExtension, improve use of singular name on BlockSet page type listing