Fix infinite scroll
Fix rule tooltips with quotes
Add unplanned criteria