fix commands generation
fix convertion of condition parameters in code to commands