Added back timezone filtering