Added text search (in progress)