Added support to text search