Iron out issues with model & collection URLs