Fix criterion not being parsed, add regex criterion