diff --git a/lib/galaxy/tool_util/xsd/galaxy.xsd b/lib/galaxy/tool_util/xsd/galaxy.xsd
index 6983bca21b5..9baca16c565 100644
--- a/lib/galaxy/tool_util/xsd/galaxy.xsd
+++ b/lib/galaxy/tool_util/xsd/galaxy.xsd
@@ -3677,6 +3677,23 @@ is the ``none`` preset.</xs:documentation>
 ``<options>`` tag set - modify (e.g. remove, add, sort, ...) the list of values obtained from a locally stored file (e.g.
 a tool data table) or a dataset in the current history.
 
+Currently the following filters are defined:
+
+* ``static_value`` filter options for which the entry in a given ``column`` of the referenced file based on equality to the ``value`` attribute of the filter. 
+* ``regexp`` similar to the ``static_value`` filter, but checks if the regular expression given by ``value`` matches the entry.
+* ``param_value`` filter options for which the entry in a given ``column`` of the referenced file based on properties of another input parameter specified by ``ref``. This property is by default the value of the parameter, but also the values of another attribute (``ref_attribute``) of the parameter can be used, e.g. the extension of a data input.
+* ``data_meta`` populate or filter options based on the metadata of another input parameter specified by ``ref``. If a ``column`` is given options are filtered for which the entry in this column ``column`` is equal to metadata of the input parameter specified by ``ref``. 
+If no ``column`` is given the metadata value of the referenced input is added to the options list (in this case the corresponding ``options`` tag must not have the ``from_data_table`` or ``from_dataset`` attributes). 
+In both cases the desired metadata is selected by ``key``.
+
+The ``static_value`` and ``regexp`` filters can be inverted by setting ``keep`` to true.
+
+* ``add_value``: add an option with a given ``name`` and ``value`` to the options. By default the new option is appended, with ``index`` the insertion position can be specified.
+* ``remove_value``: remove a value from the options. Either specified explicitly with ``value``, the value of another input specifified with ``ref``, or the metatdata ``key`` of another input ``meta_ref``.
+* ``unique_value``: remove options that have duplicate entries in the given ``column``.
+* ``sort_by``: sort options by the entries of a given ``column``.
+* ``multiple_splitter``: split the entries of the specified ``column``(s) in the referenced file using a ``separator``. Thereby the number of columns is increased. 
+
 ### Examples
 
 The following example from Mothur's
@@ -3777,28 +3794,8 @@ demonstrates splitting up strings into multiple values.
     <xs:attribute name="type" type="FilterType" use="required">
       <xs:annotation>
         <xs:documentation xml:lang="en"><![CDATA[
-Currently the following filters are defined:
-
-* ``static_value`` filter options for which the entry in a given ``column`` of the referenced file based on equality to the ``value`` attribute of the filter. 
-* ``regexp`` similar to the ``static_value`` filter, but checks if the regular expression given by ``value`` matches the entry.
-* ``param_value`` filter options for which the entry in a given ``column`` of the referenced file based on properties of another input parameter specified by ``ref``. This property is by default the value of the parameter, but also the values of another attribute (``ref_attribute``) of the parameter can be used, e.g. the extension of a data input.
-* ``data_meta`` If a ``column`` is given options are filtered for which the entry in this column ``column`` is equal to metadata of another input parameter specified by ``ref``. 
-If no ``column`` is given the metadata value of the referenced input is added to the options list (in this case the corresponding ``options`` tag must not have the ``from_data_table`` or ``from_dataset`` attributes). 
-In both cases the desired metadata is selected by ``key``.
-
-The above filters can be inverted by setting ``keep`` to true.
-
-* ``add_value``: add an option with a given ``name`` and ``value`` to the options. By default the new option is appended, with ``index`` the insertion position can be specified.
-* ``remove_value``: remove a value from the options. Either specified explicitly with ``value``, the value of another input specifified with ``ref``, or the metatdata ``key`` of another input ``meta_ref``.
-* ``unique_value``: remove options that have duplicate entries in the given ``column``.
-* ``sort_by``: sort options by the entries of a given ``column``.
-* ``multiple_splitter``: split the entries of the specified ``column``(s) in the referenced file using a ``separator``. Thereby the number of columns is increased. 
-
-Note that filters that are applyed after one of the latter two filters must not refer to 
-
-These values are defined in the module
-[/lib/galaxy/tools/parameters/dynamic_options.py](https://github.com/galaxyproject/galaxy/blob/master/lib/galaxy/tools/parameters/dynamic_options.py)
-in the ``filter_types`` dictionary. 
+Currently the filters in the ``filter_types`` dictionary in the module
+[/lib/galaxy/tools/parameters/dynamic_options.py](https://github.com/galaxyproject/galaxy/blob/master/lib/galaxy/tools/parameters/dynamic_options.py) are defined. 
 
 Deprecated filter types:
 
diff --git a/test/functional/tools/dbkey_filter_collection.xml b/test/functional/tools/dbkey_filter_collection.xml
index c5d4b70918f..14be948a6a5 100644
--- a/test/functional/tools/dbkey_filter_collection.xml
+++ b/test/functional/tools/dbkey_filter_collection.xml
@@ -1,5 +1,5 @@
-<tool id="dbkey_filter_collection_input" name="dbkey_filter_multi_input" version="0.1.0">
-    <description>Filter select on dbkey of multiple inputs</description>
+<tool id="dbkey_filter_collection_input" name="dbkey_filter_collection_input" version="0.1.0">
+    <description>Filter select on dbkey of collection inputs</description>
     <command><![CDATA[
         #for $input in $inputs#
         cat $input >> $output;
@@ -15,6 +15,12 @@
             <validator type="no_options" message="No reference genome is available for the build associated with the selected input dataset" />
           </options>
         </param>
+        <param name="index_multi" type="select" multiple="true" label="Using reference genome">
+          <options from_data_table="test_fasta_indexes">
+            <filter type="data_meta" ref="inputs" key="dbkey" column="1" />
+            <validator type="no_options" message="No reference genome is available for the build associated with the selected input dataset" />
+          </options>
+        </param>
     </inputs>
 
     <outputs>
@@ -22,47 +28,66 @@
     </outputs>
 
     <tests>
+        <!-- note: in the following tests two different files are needed
+             because otherwise only the later dbkey is uses. apparently
+             the two data sets would be considered as the same data set -->
         <!-- can choose a dbkey if it matches input -->
         <test>
             <param name="inputs" >
-                <collection type="paired">
+                <collection type="list">
                     <element name="e1" value="simple_line.txt" dbkey="hg19"/>
-                    <element name="e2" value="simple_line.txt" dbkey="hg19"/>
+                    <element name="e2" value="same_simple_line.txt" dbkey="hg19"/>
                 </collection>
             </param>
             <param name="index" value="hg19" />
+            <param name="index_multi" value="hg19" />
             <output name="output" file="simple_line_x2.txt"/>
         </test>
         <!-- can choose any dbkey if none specified in reference -->
         <test>
             <param name="inputs" >
-                <collection type="paired">
+                <collection type="list">
                     <element name="e1" value="simple_line.txt"/>
-                    <element name="e2" value="simple_line.txt"/>
+                    <element name="e2" value="same_simple_line.txt"/>
                 </collection>
             </param>
             <param name="index" value="hg19" />
+            <param name="index_multi" value="hg18,hg19" />
             <output name="output" file="simple_line_x2.txt"/>
         </test>
         <!-- can choose any dbkey specified in reference -->
         <test>
             <param name="inputs" >
-                <collection type="paired">
-                    <element name="e1" value="simple_line.txt" dbkey="hg18"/>
-                    <element name="e2" value="simple_line.txt" dbkey="hg19"/>
+                <collection type="list">
+                    <element name="e1" value="simple_line.txt" dbkey="hg19"/>
+                    <element name="e2" value="same_simple_line.txt" dbkey="hg18"/>
                 </collection>
             </param>
             <param name="index" value="hg18" />
+            <param name="index_multi" value="hg18,hg19" />
             <output name="output" file="simple_line_x2.txt"/>
         </test>
         <test>
             <param name="inputs" >
-                <collection type="paired">
-                    <element name="e1" value="simple_line.txt" dbkey="hg18"/>
-                    <element name="e2" value="simple_line.txt" dbkey="hg19"/>
+                <collection type="list">
+                    <element name="e1" value="simple_line.txt" dbkey="hg19"/>
+                    <element name="e2" value="same_simple_line.txt" dbkey="hg18"/>
                 </collection>
             </param>
             <param name="index" value="hg19" />
+            <param name="index_multi" value="hg18,hg19" />
+            <output name="output" file="simple_line_x2.txt"/>
+        </test>
+        <!-- cant choose a dkkey different from reference -->
+        <test expect_failure="true">
+            <param name="inputs" >
+                <collection type="list">
+                    <element name="e1" value="simple_line.txt" dbkey="hg19"/>
+                    <element name="e2" value="same_simple_line.txt" dbkey="hg19"/>
+                </collection>
+            </param>
+            <param name="index" value="hg18" />
+            <param name="index_multi" value="hg18" />
             <output name="output" file="simple_line_x2.txt"/>
         </test>
     </tests>
diff --git a/test/functional/tools/samples_tool_conf.xml b/test/functional/tools/samples_tool_conf.xml
index d0f17de6711..5677d83a754 100644
--- a/test/functional/tools/samples_tool_conf.xml
+++ b/test/functional/tools/samples_tool_conf.xml
@@ -46,6 +46,7 @@
   <tool file="filter_static_regexp.xml" />
   <tool file="dbkey_filter_input.xml" />
   <tool file="dbkey_filter_multi_input.xml" />
+  <tool file="dbkey_filter_collection.xml" />
   <tool file="dbkey_output_action.xml" />
   <tool file="composite_output.xml" />
   <tool file="composite_output_tests.xml" />