Fix extra filter when set extra order.

7 jobs for !4595 with fix-avs-extapplication in 25 minutes and 42 seconds (queued for 2 seconds)
merge request