diff --git a/portal-impl/src/com/liferay/portlet/wiki/importers/mediawiki/MediaWikiImporter.java b/portal-impl/src/com/liferay/portlet/wiki/importers/mediawiki/MediaWikiImporter.java
index 1ae467afd4839b4156f519fd52ba78148e68c38f..67d1b00bcef8ee9af0dd778e335e3a68dfb8e05a 100644
--- a/portal-impl/src/com/liferay/portlet/wiki/importers/mediawiki/MediaWikiImporter.java
+++ b/portal-impl/src/com/liferay/portlet/wiki/importers/mediawiki/MediaWikiImporter.java
@@ -285,7 +285,7 @@ public class MediaWikiImporter implements WikiImporter {
 		description = description.replaceAll(
 			_categoriesPattern.pattern(), StringPool.BLANK);
 
-		return normalize(description, 300);
+		return normalize(description, 255);
 	}
 
 	protected String normalizeTitle(String title) {
@@ -433,6 +433,10 @@ public class MediaWikiImporter implements WikiImporter {
 
 			String title = pageElement.elementText("title");
 
+			if (isSpecialMediaWikiPage(title, specialNamespaces)) {
+				continue;
+			}
+
 			title = normalizeTitle(title);
 
 			percentage = Math.min(
@@ -441,10 +445,6 @@ public class MediaWikiImporter implements WikiImporter {
 
 			progressTracker.setPercent(percentage);
 
-			if (isSpecialMediaWikiPage(title, specialNamespaces)) {
-				continue;
-			}
-
 			List<Element> revisionElements = pageElement.elements("revision");
 
 			if (importLatestVersion) {
@@ -526,7 +526,7 @@ public class MediaWikiImporter implements WikiImporter {
 
 				try {
 					assetTag = AssetTagLocalServiceUtil.getTag(
-						node.getCompanyId(), categoryName);
+						node.getGroupId(), categoryName);
 				}
 				catch (NoSuchTagException nste) {
 					ServiceContext serviceContext = new ServiceContext();
@@ -536,13 +536,16 @@ public class MediaWikiImporter implements WikiImporter {
 					serviceContext.setScopeGroupId(node.getGroupId());
 
 					assetTag = AssetTagLocalServiceUtil.addTag(
-						userId, categoryName, null, serviceContext);
-				}
+						userId, serviceContext.getScopeGroupId(), categoryName,
+						null, serviceContext);
 
-				if (Validator.isNotNull(description)) {
-					AssetTagPropertyLocalServiceUtil.addTagProperty(
-						userId, assetTag.getTagId(), "description",
-						description);
+					if (PropsValues.ASSET_TAG_PROPERTIES_ENABLED &&
+						Validator.isNotNull(description)) {
+
+						AssetTagPropertyLocalServiceUtil.addTagProperty(
+							userId, assetTag.getTagId(), "description",
+							description);
+					}
 				}
 			}
 			catch (SystemException se) {
@@ -582,7 +585,8 @@ public class MediaWikiImporter implements WikiImporter {
 				serviceContext.setScopeGroupId(node.getGroupId());
 
 				assetTag = AssetTagLocalServiceUtil.addTag(
-					userId, categoryName, null, serviceContext);
+					userId, serviceContext.getScopeGroupId(), categoryName,
+					null, serviceContext);
 			}
 
 			assetTagNames.add(assetTag.getName());
