Upgrade MSearch and hide exception