Tweak uri rules. Closes #2233