Fixed routing issues with arguments, oops.