added support for no '?r='