Handle Z39.50 Options better