Improves query