fixed nullpointer in Order and merged Amits changes for Edit-Orders