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

Refer to #265