YES! Resolved #1 by rewriting regex :D