Fixed service catalog to use Tree instead of xpath

Fixed service catalog to use Tree instead of xpath