More fixes for the &Task command