#1950 | Fixed drug filtering logic in drug schedule, added tests