Use uri builder for tracking url + refactoring + bugfix