Greatly improve the selection of active fixes
Simplify code
Use checkboxes for aggressive