Index: ETKI18nContentSupport.java
===================================================================
--- ETKI18nContentSupport.java	(revision 33830)
+++ ETKI18nContentSupport.java	(working copy)
@@ -83,8 +83,17 @@
      */
     @Override
     protected String toI18NURI(String uri, Locale locale) {
-        String handle = URI2RepositoryManager.getInstance().getHandle(MgnlContext.getAggregationState().getCurrentURI());
-        String repo = URI2RepositoryManager.getInstance().getRepository(MgnlContext.getAggregationState().getCurrentURI());
+        final String selector = MgnlContext.getAggregationState().getSelector();
+		final String currentURI = MgnlContext.getAggregationState().getCurrentURI();
+       
+		String currentURIWithoutSelector = currentURI;
+		if (!StringUtils.isEmpty(selector)){
+			currentURIWithoutSelector = StringUtils.replace(currentURI, "." + selector, "");
+		}
+       
+		String handle = URI2RepositoryManager.getInstance().getHandle(currentURIWithoutSelector);
+		String repo = URI2RepositoryManager.getInstance().getRepository(currentURIWithoutSelector);
+		
         Content content = null;
         try {
             content = MgnlContext.getSystemContext().getHierarchyManager(repo).getContent(handle);