Enable use of extended dismax
Fix some merge errors