Polo - improve regex and value assignment