Fixed BYDAY filter bug
Code-reduced the fix