Improved svg lookup