Filter Wizard: keep aggregate HBs and HB1/HB2/HB3 rates in sync

Now we use a separate field for the aggregate HBs value instead of
overwriting HB1 when the advanced mode is toggled.

Signed-off-by: Tim Harder <radhermit@gmail.com>