add template
revise queries-in section