diff --git a/bundles/org.eclipse.passage.lic.licenses.edit/src-gen/org/eclipse/passage/lic/licenses/edit/providers/LicensePlanFeatureItemProvider.java b/bundles/org.eclipse.passage.lic.licenses.edit/src-gen/org/eclipse/passage/lic/licenses/edit/providers/LicensePlanFeatureItemProvider.java
index b4d0fb37c..60faa24d2 100644
--- a/bundles/org.eclipse.passage.lic.licenses.edit/src-gen/org/eclipse/passage/lic/licenses/edit/providers/LicensePlanFeatureItemProvider.java
+++ b/bundles/org.eclipse.passage.lic.licenses.edit/src-gen/org/eclipse/passage/lic/licenses/edit/providers/LicensePlanFeatureItemProvider.java
@@ -32,6 +32,7 @@
 import org.eclipse.passage.lic.licenses.edit.LicensesEditPlugin;
 import org.eclipse.passage.lic.licenses.model.api.FeatureRef;
 import org.eclipse.passage.lic.licenses.model.api.LicensePlanFeature;
+import org.eclipse.passage.lic.licenses.model.api.VersionMatch;
 import org.eclipse.passage.lic.licenses.model.meta.LicensesFactory;
 import org.eclipse.passage.lic.licenses.model.meta.LicensesPackage;
 
@@ -192,9 +193,13 @@ public String getText(Object object) {
 		if (identifier == null || identifier.length() == 0) {
 			identifier = getString("_UI_LicensePlanFeature_type"); //$NON-NLS-1$
 		}
-		String version = feature.getVersionMatch().getVersion();
-		if (version == null || version.length() == 0) {
-			return identifier;
+		VersionMatch match = feature.getVersionMatch();
+		String version = ""; //$NON-NLS-1$
+		if (match != null) {
+			version = match.getVersion();
+			if (version == null || version.length() == 0) {
+				return identifier;
+			}
 		}
 		return getString("_UI_LicensePlanFeature_text_pattern", new Object[] { identifier, version }); //$NON-NLS-1$
 	}
diff --git a/bundles/org.eclipse.passage.loc.agreements.emfforms/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.loc.agreements.emfforms/META-INF/MANIFEST.MF
index ca3331c24..010c193ea 100644
--- a/bundles/org.eclipse.passage.loc.agreements.emfforms/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.loc.agreements.emfforms/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Automatic-Module-Name: org.eclipse.passage.loc.agreements.emfforms
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.passage.loc.agreements.emfforms;singleton:=true
-Bundle-Version: 0.8.1.qualifier
+Bundle-Version: 0.9.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
diff --git a/bundles/org.eclipse.passage.loc.agreements.emfforms/src/org/eclipse/passage/loc/agreements/emfforms/renderers/AgreementFormat.java b/bundles/org.eclipse.passage.loc.agreements.emfforms/src/org/eclipse/passage/loc/agreements/emfforms/renderers/AgreementFormat.java
index 35c66d0a6..cea2f9d7d 100644
--- a/bundles/org.eclipse.passage.loc.agreements.emfforms/src/org/eclipse/passage/loc/agreements/emfforms/renderers/AgreementFormat.java
+++ b/bundles/org.eclipse.passage.loc.agreements.emfforms/src/org/eclipse/passage/loc/agreements/emfforms/renderers/AgreementFormat.java
@@ -49,7 +49,7 @@ static class Supported implements Supplier<List<AgreementFormat>> {
 		// TODO: get rid of the code in constructor: use CashingFunction from
 		// ru.arsysop.lang
 		private final List<AgreementFormat> supported = Arrays.asList(//
-				new AgreementFormat(".txt", "Text file (*.txt)", "text/plain") //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
+				new AgreementFormat(".txt", "*.txt", "text/plain") //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
 		);
 
 		@Override
diff --git a/bundles/org.eclipse.passage.loc.agreements.emfforms/src/org/eclipse/passage/loc/agreements/emfforms/renderers/LocatedAgreementFile.java b/bundles/org.eclipse.passage.loc.agreements.emfforms/src/org/eclipse/passage/loc/agreements/emfforms/renderers/LocatedAgreementFile.java
index e162f974f..efa99152a 100644
--- a/bundles/org.eclipse.passage.loc.agreements.emfforms/src/org/eclipse/passage/loc/agreements/emfforms/renderers/LocatedAgreementFile.java
+++ b/bundles/org.eclipse.passage.loc.agreements.emfforms/src/org/eclipse/passage/loc/agreements/emfforms/renderers/LocatedAgreementFile.java
@@ -40,7 +40,7 @@ public Optional<File> get() {
 		FileDialog dialog = new FileDialog(shell);
 		List<AgreementFormat> formats = new AgreementFormat.Supported().get();
 		dialog.setText("Point an agreement content file"); //$NON-NLS-1$
-		dialog.setFilterExtensions(filters(formats, AgreementFormat::extention));
+		dialog.setFilterExtensions(filters(formats, AgreementFormat::description));
 		dialog.setFilterNames(filters(formats, AgreementFormat::description));
 		return file(Optional.ofNullable(dialog.open()));
 	}
diff --git a/bundles/org.eclipse.passage.loc.workbench/src/org/eclipse/passage/loc/internal/workbench/LocDomainRegistryAccess.java b/bundles/org.eclipse.passage.loc.workbench/src/org/eclipse/passage/loc/internal/workbench/LocDomainRegistryAccess.java
index 6b76092ac..5c9db42a2 100644
--- a/bundles/org.eclipse.passage.loc.workbench/src/org/eclipse/passage/loc/internal/workbench/LocDomainRegistryAccess.java
+++ b/bundles/org.eclipse.passage.loc.workbench/src/org/eclipse/passage/loc/internal/workbench/LocDomainRegistryAccess.java
@@ -39,7 +39,6 @@ public class LocDomainRegistryAccess implements EditingDomainRegistryAccess {
 
 	@Reference(cardinality = ReferenceCardinality.MULTIPLE)
 	public void registerEditingDomainRegistry(EditingDomainRegistry<?> instance, Map<String, Object> properties) {
-		System.out.println("LocDomainRegistryAccess.registerEditingDomainRegistry()"); //$NON-NLS-1$
 		String domain = String.valueOf(properties.get(PROPERTY_DOMAIN_NAME));
 		registerEntry(domainRegistries, domain, instance);
 		String extension = String.valueOf(properties.get(PROPERTY_FILE_EXTENSION));