Fixing search user query. see BT#6708