adds back the negative filter
Merge branch 'fix_wait_time_calc'