Fixes to format plugin.
Fix for sort fields.