Fixed some queries and URIMatcher