Port over the urls.py improvements to Oscar version