bug fixes

Handle All switch correctly