Add shipping fees evaluation directive. Fix issues