Timob 12767 Bug fixes and api usage analysis granularity improvements