xml parsing fix

Added attribute ‘w’ as a list in the xml parse fix.
Formatting script update

Formatting scripts are updated for the new database structure (type
inconsistencies removed)