updated regex router matching