[FOLD] More regex fine tuning