added class 'btn' to submit buttons
make-step2 now handles empty 'query' param properly, sends them back to step1