Make the query more better for more people