Added filtering to the various data extraction methods.
Expanded the filtering test cases to include multiple clauses.