Simplify waterfall id, and fix debounce
Fix <a<a<b>>> debounce issue, add tests for it