Add strict mode support
various URI matching enhancements