Update MWSearch to master

For better error logging

Change-Id: I2dfadbf47c7691fb635ec5775dcb1bae62e64970