IB/Verbs: Reform IB-core sa_query