cleanup
add more details to queryItems spec
remove underscore dependency