Fix Fav Filter
See merge request !3630 (merged)
(cherry picked from commit 7f687b92)
284032a9 Fix Fav Filter 2cec474d Fix 47a3828d Fix if elif 8d715fc8 Fix if elif