Fixing non-timebased filtering to make sure changeTimeFilter is set