Adding URI exceptions to global filter.
Fixing merge conflicts.