b -> batch variable rename
fixed batch selection query