fixed Query stuff. updated annotations to use namespaces