diff --git a/app/assets/javascripts/event_news/wpex.js b/app/assets/javascripts/event_news/wpex.js
index d67a8c4..5bc9aa1 100644
--- a/app/assets/javascripts/event_news/wpex.js
+++ b/app/assets/javascripts/event_news/wpex.js
@@ -2461,10 +2461,13 @@ $.fn.wpexEqualHeights = function (options) {
 				var elID    = $this.attr( 'id' );
 				var elClass = elID ? ' wpex-' + elID : '';
 				if ( $this.is( ':visible' ) ) {
+					var wpex_wrap = $('<div></div>');
+					wpex_wrap.insertBefore($this);
+					wpex_wrap.append($this);
 					if ( $this.attr( 'multiple' ) ) {
-						$this.wrap( '<div class="wpex-multiselect-wrap' + elClass + '"></div>' );
+						wpex_wrap.attr('class', 'wpex-multiselect-wrap' + elClass);
 					} else {
-						$this.wrap( '<div class="wpex-select-wrap' + elClass + '"></div>' );
+						wpex_wrap.attr('class', 'wpex-select-wrap' + elClass);
 					}
 				}
 			} );
diff --git a/app/helpers/event_news_helper.rb b/app/helpers/event_news_helper.rb
index a3ee097..879a812 100644
--- a/app/helpers/event_news_helper.rb
+++ b/app/helpers/event_news_helper.rb
@@ -330,7 +330,7 @@ module EventNewsHelper
 
 
     if @target_action == "index"
-      filename = overridehtml.nil? ? params[:layout_type].to_s.split('/').last : overridehtml
+      filename = File.basename(overridehtml.nil? ? params[:layout_type] : overridehtml)
       f = File.join(Rails.root, 'app', 'templates', "#{@key}", 'modules', 'event_news_mod', "#{filename}.html.erb")
       if !File.exists?f
         f = File.join(Rails.root, 'app', 'templates', "#{@key}", 'modules', 'event_news_mod', "index.html.erb")