Fix selecting commands from filtered list