Fix expected value editing support