diff --git a/current/core/src/main/java/com/coresecure/brightcove/wrapper/models/ExperiencePlayer.java b/current/core/src/main/java/com/coresecure/brightcove/wrapper/models/ExperiencePlayer.java
index 4a6bfb1..abb2635 100644
--- a/current/core/src/main/java/com/coresecure/brightcove/wrapper/models/ExperiencePlayer.java
+++ b/current/core/src/main/java/com/coresecure/brightcove/wrapper/models/ExperiencePlayer.java
@@ -25,6 +25,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.jcr.Node;
@@ -166,6 +169,13 @@ protected void init(){
             LOGGER.info("current AEM Version : " + version);
 
             experienceID = properties.get("experience", "").trim();
+            Pattern p = Pattern.compile("\\[(.*?)\\]");
+            Matcher m = p.matcher(experienceID);
+
+            if (m.find()) {
+                experienceID = m.group(1);
+            }
+            
             account = properties.get("account", "").trim();
             embedType = properties.get("embedType", "").trim();
             inlineCSS = properties.get("inlineCSS","");
diff --git a/current/ui.apps.structure/pom.xml b/current/ui.apps.structure/pom.xml
index 0c83eb7..22bd39e 100644
--- a/current/ui.apps.structure/pom.xml
+++ b/current/ui.apps.structure/pom.xml
@@ -40,6 +40,8 @@
                         <!-- Common overlay roots -->
                         <filter><root>/apps/sling</root></filter>
                         <filter><root>/apps/cq</root></filter>
+                        <filter><root>/apps/cq/core</root></filter>
+                        <filter><root>/apps/cq/core/content</root></filter>
                         <filter><root>/apps/dam</root></filter>
                         <filter><root>/apps/wcm</root></filter>
                         <filter><root>/apps/msm</root></filter>
diff --git a/current/ui.apps/src/main/content/META-INF/vault/filter.xml b/current/ui.apps/src/main/content/META-INF/vault/filter.xml
index cb0ef07..5e90512 100644
--- a/current/ui.apps/src/main/content/META-INF/vault/filter.xml
+++ b/current/ui.apps/src/main/content/META-INF/vault/filter.xml
@@ -6,6 +6,6 @@
     <filter root="/apps/brightcove/components"/>
     <filter root="/apps/brightcove/extensions"/>
     <filter root="/apps/brightcove/templates"/>
-    <filter root="/apps/cq/core/content/nav/brightcove"/>
+    <filter root="/apps/cq/core/content/nav"/>
     <filter root="/apps/dam/gui" mode="update"/>
 </workspaceFilter>
diff --git a/current/ui.apps/src/main/content/jcr_root/apps/brightcove/clientlibs/clientlib-dialogs/js/experiences.js b/current/ui.apps/src/main/content/jcr_root/apps/brightcove/clientlibs/clientlib-dialogs/js/experiences.js
index 93cd6ec..29b3299 100644
--- a/current/ui.apps/src/main/content/jcr_root/apps/brightcove/clientlibs/clientlib-dialogs/js/experiences.js
+++ b/current/ui.apps/src/main/content/jcr_root/apps/brightcove/clientlibs/clientlib-dialogs/js/experiences.js
@@ -3,6 +3,7 @@
 
     var ACCOUNTID = "./account", EXPERIENCES = "./experience";
     var existingValues = {};
+    var account_id = "";
 
     const DIALOG_ACCOUNT_FIELD_SELECTOR = '.brightcove-dialog-experiences-account-dropdown';
 
@@ -74,6 +75,20 @@
                     });
                 }
             });
+            
+            accountSelector.addEventListener("change", function(event) {
+                var accountSelector =  $(DIALOG_ACCOUNT_FIELD_SELECTOR).get(0);
+                account_id = (accountSelector.selectedItem != null)
+                                    ? accountSelector.selectedItem.value : "";
+
+                contentSelector.attr('data-granite-autocomplete-src',
+                    updateQueryStringParameter(
+                        contentSelector.attr('data-granite-autocomplete-src'),
+                        'account_id',
+                        account_id
+                    )
+                );
+            });
 
         }
 
diff --git a/current/ui.apps/src/main/content/jcr_root/apps/brightcove/components/content/brightcoveexperiences/_cq_dialog/.content.xml b/current/ui.apps/src/main/content/jcr_root/apps/brightcove/components/content/brightcoveexperiences/_cq_dialog/.content.xml
index 653dae7..3aadc61 100755
--- a/current/ui.apps/src/main/content/jcr_root/apps/brightcove/components/content/brightcoveexperiences/_cq_dialog/.content.xml
+++ b/current/ui.apps/src/main/content/jcr_root/apps/brightcove/components/content/brightcoveexperiences/_cq_dialog/.content.xml
@@ -2,6 +2,7 @@
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:granite="http://www.adobe.com/jcr/granite/1.0"
     jcr:primaryType="nt:unstructured"
     jcr:title="Brightcove Experience Selector"
+     extraClientlibs="[brightcove.player.dialogs]"
     sling:resourceType="cq/gui/components/authoring/dialog">
     <content
         jcr:primaryType="nt:unstructured"
diff --git a/current/ui.apps/src/main/content/jcr_root/apps/brightcove/components/content/brightcoveexperiences/brightcoveexperiences.html b/current/ui.apps/src/main/content/jcr_root/apps/brightcove/components/content/brightcoveexperiences/brightcoveexperiences.html
index 7319635..178373d 100644
--- a/current/ui.apps/src/main/content/jcr_root/apps/brightcove/components/content/brightcoveexperiences/brightcoveexperiences.html
+++ b/current/ui.apps/src/main/content/jcr_root/apps/brightcove/components/content/brightcoveexperiences/brightcoveexperiences.html
@@ -35,7 +35,7 @@
       <div class="player-embed-wrap">
         <div id="container-${player.componentID}">
           <iframe 
-            src="https://players.brightcove.net/${player.account}/experience_${properties.experience}/index.html?&usage=cms:cms:aem:${player.version}:${player.bundleVersion}:experienceiframe" 
+            src="https://players.brightcove.net/${player.account}/experience_${player.experienceID}/index.html?&usage=cms:cms:aem:${player.version}:${player.bundleVersion}:experienceiframe" 
             allowfullscreen=""
             webkitallowfullscreen="" 
             mozallowfullscreen="">