cleanup

fix links to issue in comments
whitespace

consistent whitespace for array index
add test coverage for query 2.1.0