Commit#76 Empty search fixed