extract command and fix list to check layout, too