Fix more button
Simpler params handling