Empty search bug fixed