Improve query result
Fix results