Fix Uri matches