Simplifying uri handler & re-enabling REGEX URLs