Fix query, dependencies, and names