Use urlbuilder instead of hardcoded arguments