0029674: Improvements in Inspector tool