Optional zone selector

The zone selector may be disabled with MODE_ZONE_FILTER parameter,
removed rubbish code, add comments