Fixed escaping, support searching for empty strings