Simplified urlgenerator overload
Fixed routing bug