remove extraneous form. add div around query options