fixd uri problems and added counts management