Fixed Regexes with new Rapla Layout