save database query locally, there is an error in retrieving.
Merge With Develop