$regex criteria made more compatible