#581 - fix multiple option logic, fix internal handler.cancelAll function