Added uri attributes in the uri filter
Added more rules