handbid fix double echoing of shortcodes
added organization shortcodes
state addition
shortcode fixes to accomodate for state change