fix the collapse filters button
Merge remote-tracking branch 'origin' into 2.3