Minor fixes in W17 Search