Fixed empty string search