Some adjustment in demo forms and restored the db name in xml files