Change uri regexp splitting to delimiter splitting