Uri mapper tracking fixes