Re #922 Clean the value before using in search.