=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/filter/Filter.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/filter/Filter.java	2013-10-30 12:51:03 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/filter/Filter.java	1970-01-01 00:00:00 +0000
@@ -1,101 +0,0 @@
-package org.hisp.dhis.filter;
-
-/*
- * Copyright (c) 2004-2013, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonView;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import org.hisp.dhis.common.BaseNameableObject;
-import org.hisp.dhis.common.DxfNamespaces;
-import org.hisp.dhis.common.view.DetailedView;
-import org.hisp.dhis.common.view.ExportView;
-
-/**
- * @author Ovidiu Rosu <rosu.ovi@gmail.com>
- */
-@JacksonXmlRootElement(localName = "filter", namespace = DxfNamespaces.DXF_2_0)
-public class Filter
-    extends BaseNameableObject
-{
-    /**
-     * Determines if a de-serialized file is compatible with this class.
-     */
-    private static final long serialVersionUID = 8736213901318412954L;
-
-    private String jsonFilter;
-
-    private Integer sortOrder;
-
-    //--------------------------------------------------------------------------
-    // Constructors
-    //--------------------------------------------------------------------------
-
-    public Filter()
-    {
-    }
-
-    public Filter( String name )
-    {
-        this.name = name;
-    }
-
-    public Filter( String uid, String description, String name, String jsonFilter )
-    {
-        super( uid, description, name );
-        this.jsonFilter = jsonFilter;
-    }
-
-    // -------------------------------------------------------------------------
-    // Getters and setters properties
-    // -------------------------------------------------------------------------
-
-    @JsonProperty
-    @JsonView({ DetailedView.class, ExportView.class })
-    @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
-    public String getJsonFilter()
-    {
-        return jsonFilter;
-    }
-
-    public void setJsonFilter( String jsonFilter )
-    {
-        this.jsonFilter = jsonFilter;
-    }
-
-    public Integer getSortOrder()
-    {
-        return sortOrder;
-    }
-
-    public void setSortOrder( Integer sortOrder )
-    {
-        this.sortOrder = sortOrder;
-    }
-}

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/filter/FilterService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/filter/FilterService.java	2013-10-30 12:51:03 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/filter/FilterService.java	2013-10-31 10:29:22 +0000
@@ -35,21 +35,21 @@
  */
 public interface FilterService
 {
-    Filter getFilter( Integer id );
-
-    Filter getFilterByUid( String uid );
-
-    Collection<Filter> getAllFilters();
-
-    Collection<Filter> getFiltersBetweenByName( String name, int first, int max );
-
-    Collection<Filter> getFiltersBetween( int first, int max );
-
-    void saveFilter( Filter filter );
-
-    void updateFilter( Filter filter );
-
-    void deleteFilter( Filter filter );
+    MetaDataFilter getFilter( Integer id );
+
+    MetaDataFilter getFilterByUid( String uid );
+
+    Collection<MetaDataFilter> getAllFilters();
+
+    Collection<MetaDataFilter> getFiltersBetweenByName( String name, int first, int max );
+
+    Collection<MetaDataFilter> getFiltersBetween( int first, int max );
+
+    void saveFilter( MetaDataFilter metaDataFilter );
+
+    void updateFilter( MetaDataFilter metaDataFilter );
+
+    void deleteFilter( MetaDataFilter metaDataFilter );
 
     int getFilterCountByName( String name );
 

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/filter/FilterStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/filter/FilterStore.java	2013-10-30 12:51:03 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/filter/FilterStore.java	2013-10-31 10:29:22 +0000
@@ -34,6 +34,6 @@
  * @author Ovidiu Rosu <rosu.ovi@gmail.com>
  */
 public interface FilterStore
-    extends GenericIdentifiableObjectStore<Filter>
+    extends GenericIdentifiableObjectStore<MetaDataFilter>
 {
 }

=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/filter/MetaDataFilter.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/filter/MetaDataFilter.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/filter/MetaDataFilter.java	2013-10-31 10:29:22 +0000
@@ -0,0 +1,101 @@
+package org.hisp.dhis.filter;
+
+/*
+ * Copyright (c) 2004-2013, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonView;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import org.hisp.dhis.common.BaseNameableObject;
+import org.hisp.dhis.common.DxfNamespaces;
+import org.hisp.dhis.common.view.DetailedView;
+import org.hisp.dhis.common.view.ExportView;
+
+/**
+ * @author Ovidiu Rosu <rosu.ovi@gmail.com>
+ */
+@JacksonXmlRootElement(localName = "filter", namespace = DxfNamespaces.DXF_2_0)
+public class MetaDataFilter
+    extends BaseNameableObject
+{
+    /**
+     * Determines if a de-serialized file is compatible with this class.
+     */
+    private static final long serialVersionUID = 8736213901318412954L;
+
+    private String jsonFilter;
+
+    private Integer sortOrder;
+
+    //--------------------------------------------------------------------------
+    // Constructors
+    //--------------------------------------------------------------------------
+
+    public MetaDataFilter()
+    {
+    }
+
+    public MetaDataFilter( String name )
+    {
+        this.name = name;
+    }
+
+    public MetaDataFilter( String uid, String description, String name, String jsonFilter )
+    {
+        super( uid, description, name );
+        this.jsonFilter = jsonFilter;
+    }
+
+    // -------------------------------------------------------------------------
+    // Getters and setters properties
+    // -------------------------------------------------------------------------
+
+    @JsonProperty
+    @JsonView({ DetailedView.class, ExportView.class })
+    @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+    public String getJsonFilter()
+    {
+        return jsonFilter;
+    }
+
+    public void setJsonFilter( String jsonFilter )
+    {
+        this.jsonFilter = jsonFilter;
+    }
+
+    public Integer getSortOrder()
+    {
+        return sortOrder;
+    }
+
+    public void setSortOrder( Integer sortOrder )
+    {
+        this.sortOrder = sortOrder;
+    }
+}

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/filter/DefaultFilterService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/filter/DefaultFilterService.java	2013-10-30 12:51:03 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/filter/DefaultFilterService.java	2013-10-31 10:29:22 +0000
@@ -75,51 +75,51 @@
     // -------------------------------------------------------------------------
 
     @Override
-    public Filter getFilter( Integer id )
+    public MetaDataFilter getFilter( Integer id )
     {
         return filterStore.get( id );
     }
 
     @Override
-    public Filter getFilterByUid( String uid )
+    public MetaDataFilter getFilterByUid( String uid )
     {
         return filterStore.getByUid( uid );
     }
 
     @Override
-    public Collection<Filter> getAllFilters()
+    public Collection<MetaDataFilter> getAllFilters()
     {
         return filterStore.getAll();
     }
 
     @Override
-    public Collection<Filter> getFiltersBetweenByName( String name, int first, int max )
+    public Collection<MetaDataFilter> getFiltersBetweenByName( String name, int first, int max )
     {
         return getObjectsBetweenByName( i18nService, filterStore, name, first, max );
     }
 
     @Override
-    public Collection<Filter> getFiltersBetween( int first, int max )
+    public Collection<MetaDataFilter> getFiltersBetween( int first, int max )
     {
         return getObjectsBetween( i18nService, filterStore, first, max );
     }
 
     @Override
-    public void saveFilter( Filter filter )
-    {
-        filterStore.save( filter );
-    }
-
-    @Override
-    public void updateFilter( Filter filter )
-    {
-        filterStore.update( filter );
-    }
-
-    @Override
-    public void deleteFilter( Filter filter )
-    {
-        filterStore.delete( filter );
+    public void saveFilter( MetaDataFilter metaDataFilter )
+    {
+        filterStore.save( metaDataFilter );
+    }
+
+    @Override
+    public void updateFilter( MetaDataFilter metaDataFilter )
+    {
+        filterStore.update( metaDataFilter );
+    }
+
+    @Override
+    public void deleteFilter( MetaDataFilter metaDataFilter )
+    {
+        filterStore.delete( metaDataFilter );
     }
 
     @Override

=== removed directory 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/filter/hibernate'
=== removed file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/filter/hibernate/HibernateFilterStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/filter/hibernate/HibernateFilterStore.java	2013-10-30 12:51:03 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/filter/hibernate/HibernateFilterStore.java	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-package org.hisp.dhis.filter.hibernate;
-
-/*
- * Copyright (c) 2004-2013, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore;
-import org.hisp.dhis.filter.Filter;
-import org.hisp.dhis.filter.FilterStore;
-
-/**
- * @author Ovidiu Rosu <rosu.ovi@gmail.com>
- */
-public class HibernateFilterStore
-    extends HibernateIdentifiableObjectStore<Filter>
-    implements FilterStore
-{
-}

=== added directory 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/metadatafilter'
=== added directory 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/metadatafilter/hibernate'
=== added file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/metadatafilter/hibernate/HibernateFilterStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/metadatafilter/hibernate/HibernateFilterStore.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/metadatafilter/hibernate/HibernateFilterStore.java	2013-10-31 10:29:22 +0000
@@ -0,0 +1,42 @@
+package org.hisp.dhis.metadatafilter.hibernate;
+
+/*
+ * Copyright (c) 2004-2013, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore;
+import org.hisp.dhis.filter.MetaDataFilter;
+import org.hisp.dhis.filter.FilterStore;
+
+/**
+ * @author Ovidiu Rosu <rosu.ovi@gmail.com>
+ */
+public class HibernateFilterStore
+    extends HibernateIdentifiableObjectStore<MetaDataFilter>
+    implements FilterStore
+{
+}

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2013-10-25 19:53:21 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2013-10-31 10:29:22 +0000
@@ -56,8 +56,8 @@
   </bean>
 
   <!--@author Ovidiu Rosu <rosu.ovi@gmail.com>-->
-  <bean id="org.hisp.dhis.filter.FilterStore" class="org.hisp.dhis.filter.hibernate.HibernateFilterStore">
-    <property name="clazz" value="org.hisp.dhis.filter.Filter" />
+  <bean id="org.hisp.dhis.filter.FilterStore" class="org.hisp.dhis.metadatafilter.hibernate.HibernateFilterStore">
+    <property name="clazz" value="org.hisp.dhis.filter.MetaDataFilter" />
     <property name="sessionFactory" ref="sessionFactory" />
     <property name="cacheable" value="true" />
   </bean>

=== removed directory 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/filter'
=== removed directory 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/filter/hibernate'
=== removed file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/filter/hibernate/Filter.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/filter/hibernate/Filter.hbm.xml	2013-10-30 12:51:03 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/filter/hibernate/Filter.hbm.xml	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"
-  [<!ENTITY identifiableProperties SYSTEM "classpath://org/hisp/dhis/common/identifiableProperties.hbm">]
-  >
-<hibernate-mapping>
-  <class name="org.hisp.dhis.filter.Filter" table="filter">
-
-    <cache usage="read-write" />
-
-    <id name="id" column="filterid">
-      <generator class="native" />
-    </id>
-
-    &identifiableProperties;
-
-    <property name="name" column="name" not-null="true" unique="true" length="160" />
-
-    <property name="description" type="text" />
-
-    <property name="jsonFilter" column="jsonfilter" type="text" />
-
-  </class>
-</hibernate-mapping>

=== added directory 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/metadatafilter'
=== added directory 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/metadatafilter/hibernate'
=== added file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/metadatafilter/hibernate/MetaDataFilter.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/metadatafilter/hibernate/MetaDataFilter.hbm.xml	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/metadatafilter/hibernate/MetaDataFilter.hbm.xml	2013-10-31 10:29:22 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+  "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"
+  [<!ENTITY identifiableProperties SYSTEM "classpath://org/hisp/dhis/common/identifiableProperties.hbm">]
+  >
+<hibernate-mapping>
+  <class name="org.hisp.dhis.filter.MetaDataFilter" table="metadatafilter">
+
+    <cache usage="read-write" />
+
+    <id name="id" column="metadatafilterid">
+      <generator class="native" />
+    </id>
+
+    &identifiableProperties;
+
+    <property name="name" column="name" not-null="true" unique="true" length="160" />
+
+    <property name="description" type="text" />
+
+    <property name="jsonFilter" column="jsonfilter" type="text" />
+
+  </class>
+</hibernate-mapping>

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultExportService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultExportService.java	2013-10-31 09:19:04 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultExportService.java	2013-10-31 10:29:22 +0000
@@ -35,7 +35,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.hisp.dhis.common.IdentifiableObject;
 import org.hisp.dhis.common.IdentifiableObjectManager;
-import org.hisp.dhis.filter.Filter;
+import org.hisp.dhis.filter.MetaDataFilter;
 import org.hisp.dhis.filter.FilterService;
 import org.hisp.dhis.scheduling.TaskId;
 import org.hisp.dhis.system.notification.NotificationLevel;
@@ -232,39 +232,39 @@
     //-------------------------------------------------------------------------------------------------------
 
     @Override
-    public List<Filter> getFilters()
+    public List<MetaDataFilter> getFilters()
     {
-        return (List<Filter>) filterService.getAllFilters();
+        return (List<MetaDataFilter>) filterService.getAllFilters();
     }
 
     @Override
     public void saveFilter( JSONObject json ) throws IOException
     {
-        Filter filter = new Filter( json.getString( "name" ) );
-        filter.setDescription( json.getString( "description" ) );
-        filter.setJsonFilter( json.getString( "jsonFilter" ) );
-        filter.setAutoFields();
+        MetaDataFilter metaDataFilter = new MetaDataFilter( json.getString( "name" ) );
+        metaDataFilter.setDescription( json.getString( "description" ) );
+        metaDataFilter.setJsonFilter( json.getString( "jsonFilter" ) );
+        metaDataFilter.setAutoFields();
 
-        filterService.saveFilter( filter );
+        filterService.saveFilter( metaDataFilter );
     }
 
     @Override
     public void updateFilter( JSONObject json ) throws IOException
     {
-        Filter filter = filterService.getFilterByUid( json.getString( "uid" ) );
-        filter.setName( json.getString( "name" ) );
-        filter.setDescription( json.getString( "description" ) );
-        filter.setJsonFilter( json.getString( "jsonFilter" ) );
-        filter.setLastUpdated( new Date() );
+        MetaDataFilter metaDataFilter = filterService.getFilterByUid( json.getString( "uid" ) );
+        metaDataFilter.setName( json.getString( "name" ) );
+        metaDataFilter.setDescription( json.getString( "description" ) );
+        metaDataFilter.setJsonFilter( json.getString( "jsonFilter" ) );
+        metaDataFilter.setLastUpdated( new Date() );
 
-        filterService.updateFilter( filter );
+        filterService.updateFilter( metaDataFilter );
     }
 
     @Override
     public void deleteFilter( JSONObject json ) throws IOException
     {
-        Filter filter = filterService.getFilterByUid( json.getString( "uid" ) );
+        MetaDataFilter metaDataFilter = filterService.getFilterByUid( json.getString( "uid" ) );
 
-        filterService.deleteFilter( filter );
+        filterService.deleteFilter( metaDataFilter );
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.java	2013-10-25 19:53:21 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.java	2013-10-31 10:29:22 +0000
@@ -47,7 +47,7 @@
 import org.hisp.dhis.dataset.DataSet;
 import org.hisp.dhis.dataset.Section;
 import org.hisp.dhis.document.Document;
-import org.hisp.dhis.filter.Filter;
+import org.hisp.dhis.filter.MetaDataFilter;
 import org.hisp.dhis.indicator.Indicator;
 import org.hisp.dhis.indicator.IndicatorGroup;
 import org.hisp.dhis.indicator.IndicatorGroupSet;
@@ -199,11 +199,9 @@
         exportClasses.remove( DataElementOperand.class );
         importClasses.remove( DataElementOperand.class );
 
-        //@author Ovidiu Rosu <rosu.ovi@gmail.com>
-        allExportClasses.put( Filter.class, "filters" );
-        // Filters are not available for export/import for now
-        exportClasses.remove( Filter.class );
-        importClasses.remove( Filter.class );
+        allExportClasses.put( MetaDataFilter.class, "metaDataFilters" );
+        exportClasses.remove( MetaDataFilter.class );
+        importClasses.remove( MetaDataFilter.class );
     }
 
     public static Map<Class<? extends IdentifiableObject>, String> getAllExportMap()

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExportService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExportService.java	2013-09-15 17:29:23 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExportService.java	2013-10-31 10:29:22 +0000
@@ -29,7 +29,7 @@
  */
 
 import net.sf.json.JSONObject;
-import org.hisp.dhis.filter.Filter;
+import org.hisp.dhis.filter.MetaDataFilter;
 import org.hisp.dhis.scheduling.TaskId;
 
 import java.io.IOException;
@@ -49,7 +49,7 @@
 
     MetaData getFilteredMetaData( FilterOptions filterOptions, TaskId taskId ) throws IOException;
 
-    List<Filter> getFilters();
+    List<MetaDataFilter> getFilters();
 
     void saveFilter( JSONObject json ) throws IOException;
 

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java	2013-10-25 18:39:01 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java	2013-10-31 10:29:22 +0000
@@ -50,7 +50,7 @@
 import org.hisp.dhis.dataset.DataSet;
 import org.hisp.dhis.dataset.Section;
 import org.hisp.dhis.document.Document;
-import org.hisp.dhis.filter.Filter;
+import org.hisp.dhis.filter.MetaDataFilter;
 import org.hisp.dhis.indicator.Indicator;
 import org.hisp.dhis.indicator.IndicatorGroup;
 import org.hisp.dhis.indicator.IndicatorGroupSet;
@@ -183,7 +183,7 @@
     private List<RelationshipType> relationshipTypes = new ArrayList<RelationshipType>();
 
     //@author Ovidiu Rosu <rosu.ovi@gmail.com>
-    private List<Filter> filters = new ArrayList<Filter>();
+    private List<MetaDataFilter> metaDataFilters = new ArrayList<MetaDataFilter>();
 
     private List<PatientIdentifierType> personIdentifierTypes = new ArrayList<PatientIdentifierType>();
 
@@ -818,18 +818,17 @@
         this.dimensions = dimensions;
     }
 
-    //@author Ovidiu Rosu <rosu.ovi@gmail.com>
     @JsonProperty
-    @JacksonXmlElementWrapper(localName = "filters", namespace = DxfNamespaces.DXF_2_0)
+    @JacksonXmlElementWrapper(localName = "metaDataFilters", namespace = DxfNamespaces.DXF_2_0)
     @JacksonXmlProperty(localName = "filter", namespace = DxfNamespaces.DXF_2_0)
-    public List<Filter> getFilters()
+    public List<MetaDataFilter> getMetaDataFilters()
     {
-        return filters;
+        return metaDataFilters;
     }
 
-    public void setFilters( List<Filter> filters )
+    public void setMetaDataFilters( List<MetaDataFilter> metaDataFilters )
     {
-        this.filters = filters;
+        this.metaDataFilters = metaDataFilters;
     }
 
     @Override

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml	2013-10-25 19:53:21 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml	2013-10-31 10:29:22 +0000
@@ -117,7 +117,7 @@
   <cache name="org.hisp.dhis.dataset.LockException" maxElementsInMemory="1000" />
 
   <!--@author Ovidiu Rosu <rosu.ovi@gmail.com>-->
-  <cache name="org.hisp.dhis.filter.Filter" maxElementsInMemory="100" />
+  <cache name="org.hisp.dhis.filter.MetaDataFilter" maxElementsInMemory="100" />
 
   <!-- Hibernate Associations -->
 

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/FilterController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/FilterController.java	2013-09-08 14:37:41 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/FilterController.java	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-package org.hisp.dhis.api.controller;
-
-/*
- * Copyright (c) 2004-2013, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- *   be used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import org.hisp.dhis.filter.Filter;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * @author Ovidiu Rosu <rosu.ovi@gmail.com>
- */
-@Controller
-@RequestMapping( value = FilterController.RESOURCE_PATH )
-public class FilterController
-        extends AbstractCrudController<Filter>
-{
-    public static final String RESOURCE_PATH = "/filters";
-}

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/FilteredMetaDataController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/FilteredMetaDataController.java	2013-09-16 13:33:28 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/FilteredMetaDataController.java	2013-10-31 10:29:22 +0000
@@ -34,7 +34,7 @@
 import org.hisp.dhis.dxf2.metadata.*;
 import org.hisp.dhis.dxf2.metadata.tasks.ImportMetaDataTask;
 import org.hisp.dhis.dxf2.utils.JacksonUtils;
-import org.hisp.dhis.filter.Filter;
+import org.hisp.dhis.filter.MetaDataFilter;
 import org.hisp.dhis.importexport.ImportStrategy;
 import org.hisp.dhis.scheduling.TaskCategory;
 import org.hisp.dhis.scheduling.TaskId;
@@ -206,13 +206,13 @@
     // Detailed MetaData Export - Filter functionality
     //--------------------------------------------------------------------------
 
-    @RequestMapping( method = RequestMethod.GET, value = FilteredMetaDataController.RESOURCE_PATH + "/getFilters" )
+    @RequestMapping( method = RequestMethod.GET, value = FilteredMetaDataController.RESOURCE_PATH + "/getMetaDataFilters" )
     @PreAuthorize( "hasRole('ALL') or hasRole('F_METADATA_EXPORT')" )
     public @ResponseBody String getFilters( HttpServletRequest request, HttpServletResponse response ) throws IOException
     {
-        List<Filter> filters = exportService.getFilters();
+        List<MetaDataFilter> metaDataFilters = exportService.getFilters();
         contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_JSON, ContextUtils.CacheStrategy.NO_CACHE );
-        return JacksonUtils.toJsonAsString( filters );
+        return JacksonUtils.toJsonAsString( metaDataFilters );
     }
 
     @RequestMapping( method = RequestMethod.POST, value = FilteredMetaDataController.RESOURCE_PATH + "/saveFilter" )

=== added file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MetaDataFilterController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MetaDataFilterController.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MetaDataFilterController.java	2013-10-31 10:29:22 +0000
@@ -0,0 +1,44 @@
+package org.hisp.dhis.api.controller;
+
+/*
+ * Copyright (c) 2004-2013, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import org.hisp.dhis.filter.MetaDataFilter;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author Ovidiu Rosu <rosu.ovi@gmail.com>
+ */
+@Controller
+@RequestMapping( value = MetaDataFilterController.RESOURCE_PATH )
+public class MetaDataFilterController
+    extends AbstractCrudController<MetaDataFilter>
+{
+    public static final String RESOURCE_PATH = "/metaDataFilters";
+}

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/FilterExportFormAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/FilterExportFormAction.java	2013-10-30 12:51:03 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/FilterExportFormAction.java	2013-10-31 10:29:22 +0000
@@ -28,7 +28,7 @@
  */
 
 import com.opensymphony.xwork2.Action;
-import org.hisp.dhis.filter.Filter;
+import org.hisp.dhis.filter.MetaDataFilter;
 
 /**
  * @author Ovidiu Rosu <rosu.ovi@gmail.com>
@@ -104,16 +104,16 @@
     // Output
     // -------------------------------------------------------------------------
 
-    private Filter filter = new Filter();
+    private MetaDataFilter filter = new MetaDataFilter();
 
-    public Filter getFilter()
+    public MetaDataFilter getFilter()
     {
         return filter;
     }
 
-    public void setFilter( Filter filter )
+    public void setFilter( MetaDataFilter metaDataFilter )
     {
-        this.filter = filter;
+        this.filter = metaDataFilter;
     }
 
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/FilterListAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/FilterListAction.java	2013-08-19 22:52:16 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/FilterListAction.java	2013-10-31 10:29:22 +0000
@@ -28,7 +28,7 @@
  */
 
 import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
-import org.hisp.dhis.filter.Filter;
+import org.hisp.dhis.filter.MetaDataFilter;
 import org.hisp.dhis.filter.FilterService;
 import org.hisp.dhis.paging.ActionPagingSupport;
 
@@ -42,7 +42,7 @@
  * @author Ovidiu Rosu <rosu.ovi@gmail.com>
  */
 public class FilterListAction
-        extends ActionPagingSupport<Filter>
+        extends ActionPagingSupport<MetaDataFilter>
 {
     // -------------------------------------------------------------------------
     // Dependencies
@@ -59,16 +59,16 @@
     // Input & Output
     // -------------------------------------------------------------------------
 
-    private List<Filter> filters;
+    private List<MetaDataFilter> filters;
 
-    public List<Filter> getFilters()
+    public List<MetaDataFilter> getFilters()
     {
         return filters;
     }
 
-    public void setFilters( List<Filter> filters )
+    public void setFilters( List<MetaDataFilter> metaDataFilters )
     {
-        this.filters = filters;
+        this.filters = metaDataFilters;
     }
 
     private String key;
@@ -94,12 +94,12 @@
         {
             this.paging = createPaging( filterService.getFilterCountByName( key ) );
 
-            filters = new ArrayList<Filter>( filterService.getFiltersBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) );
+            filters = new ArrayList<MetaDataFilter>( filterService.getFiltersBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) );
         } else
         {
             this.paging = createPaging( filterService.getFilterCount() );
 
-            filters = new ArrayList<Filter>( filterService.getFiltersBetween( paging.getStartPos(), paging.getPageSize() ) );
+            filters = new ArrayList<MetaDataFilter>( filterService.getFiltersBetween( paging.getStartPos(), paging.getPageSize() ) );
         }
 
         Collections.sort( filters, IdentifiableObjectNameComparator.INSTANCE );

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/GetFilterListSortOrderAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/GetFilterListSortOrderAction.java	2013-08-19 22:52:16 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/GetFilterListSortOrderAction.java	2013-10-31 10:29:22 +0000
@@ -28,7 +28,7 @@
  */
 
 import com.opensymphony.xwork2.Action;
-import org.hisp.dhis.filter.Filter;
+import org.hisp.dhis.filter.MetaDataFilter;
 import org.hisp.dhis.filter.FilterService;
 
 import java.util.ArrayList;
@@ -55,16 +55,16 @@
     // Output
     // -------------------------------------------------------------------------
 
-    private List<Filter> filters;
+    private List<MetaDataFilter> filters;
 
-    public List<Filter> getFilters()
+    public List<MetaDataFilter> getFilters()
     {
         return filters;
     }
 
-    public void setFilters( List<Filter> filters )
+    public void setFilters( List<MetaDataFilter> metaDataFilters )
     {
-        this.filters = filters;
+        this.filters = metaDataFilters;
     }
 
     // -------------------------------------------------------------------------
@@ -74,7 +74,7 @@
     @Override
     public String execute() throws Exception
     {
-        filters = new ArrayList<Filter>( filterService.getAllFilters() );
+        filters = new ArrayList<MetaDataFilter>( filterService.getAllFilters() );
 
         return SUCCESS;
     }

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/SaveFilterListSortOrderAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/SaveFilterListSortOrderAction.java	2013-08-19 22:52:16 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/SaveFilterListSortOrderAction.java	2013-10-31 10:29:22 +0000
@@ -28,7 +28,7 @@
  */
 
 import com.opensymphony.xwork2.Action;
-import org.hisp.dhis.filter.Filter;
+import org.hisp.dhis.filter.MetaDataFilter;
 import org.hisp.dhis.filter.FilterService;
 
 import java.util.List;
@@ -71,11 +71,11 @@
 
         for ( String id : filters )
         {
-            Filter filter = filterService.getFilter( Integer.parseInt( id ) );
-
-            filter.setSortOrder( sortOrder++ );
-
-            filterService.updateFilter( filter );
+            MetaDataFilter metaDataFilter = filterService.getFilter( Integer.parseInt( id ) );
+
+            metaDataFilter.setSortOrder( sortOrder++ );
+
+            filterService.updateFilter( metaDataFilter );
         }
 
         return SUCCESS;

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filter.js'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filter.js	2013-10-30 13:30:13 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filter.js	2013-10-31 10:29:22 +0000
@@ -28,7 +28,7 @@
 {
     $.ajax( {
         type: "GET",
-        url: "../api/filteredMetaData/getFilters",
+        url: "../api/filteredMetaData/getMetaDataFilters",
         dataType: "json",
         success: function( response ) {
             filters = response;