Bug 1003116 - Use more specific URL structure