Added condition filter and Order::update check