Added escaping on search data