Fix extra filter when set extra order. When set extra order, extra query is not applied.
This will create a new commit in order to revert the existing changes.
