Updated the replacementselection and multiwaymerge AVs