Merge pull request #388 from ChaoPang/master

Show "no result message" if no data items are matched with query