Fix Api-Level handling for OKAPI searches