Merge pull request #182 from Chiene/master

Issue 181-Bug - The return data is not correct in search api.
Issue 67 - Action item 10 - Show chart.
Merge pull request #183 from john29917958/john-patch

Issue 67 - Action item 10 - Show chart.