TC-686 Set proper device search column name