Fix command sub-keys