fixed condition order & new data comparsion in import parsing