Removing query type, as it's just not needed

- Also added the build to query
Headers now implemented better