[#64] Don't parse criteria twice
Merge pull request #65 from akvo/issue/64

[#64] Don't parse criteria twice