Template Fixes

This fix is for html issues for filter templates.

When using a button option filter, clicking on the button was triggering a submit event to be fired. Because the html was within a form, the form was getting submitted accidentally. button type=button fixes this. 

The dropdown template html's option tag was also being closed with /button instead of /option, which messed up rendering somewhat.