Fixing the Report Editing issues with columns & columns_name (closes #557)