Issue 171 - Front-end code improvement.
Merge pull request #264 from john29917958/john-patch

Issue 171 - Front-end code improvement.
Issue 256 - Bug - The search API return the wrong data.
Merge pull request #266 from Chiene/chien-patch

Issue 265 - Bug - The search API return the wrong data.