odata4 fix for metadata, update and entity query