Added search query escaping