Fix for id inc; correct uri resolving