refactor: extract variable
clone filter condition; change filter condition priorities
Merge remote-tracking branch 'origin/master'