Add Regex Query Tool solution