Fixed bug: need another criteria than search text