Fixed Empty task error and search sensitivity