[WIP] Fixes for #2360, changes to correct behavior of OVO in case of tie