Fix #1964 by hijacking the OData key request and sending it to the search service