Rework the route syntax. Incorporate latest onm bug fixes.