Added filtering options, also schedule.rb works