Improve Search Quality (#1442)