fix timezones for filters (and tests for same)
anoter intermediate commit