MultiEntitySearch 2.1 (target 6.0)