City select fix for #28.