minor changes - still need to convert shortcode to access do_search and separate presentation layer a bit more cleanly