Fix for OData query key inference bug