Shortcode tidy and helper file fix plus changes to model search widget