Added more consistent URL parameter usage