[#64] Don't parse criteria twice