Fixed unoptimized arg names in selects

Fixed unoptimized arg names in selects