Change handling of xml to Hash.from_xml. Illiminate loops in controller
Few minor changes