bugfix on export & modify some app logics