Update aquery version, fix whitespace flaws