Modifications to allow template filtering
Merge pull request #8 from helenhousandi/RED-584

Modifications to allow template filtering