Shortcodes:
- fix for search form sometimes not appearing
- format the search form correctly when using shortcode templates