Some fix in new and edit requistion