Fix namespace-aware xpath segment links

Link through catalogs not synthesis