Improved URL consolidation