Fix es-query usage text
Add optimize subcommand