Remove subquery in update support