Merge pull request #45 from vexxhost/metadata-filter

Metadata filter modified.