moved HasContainer out of DefaultQuery. Provided support for Contains.IN and AnnotatedList and Collection. Added Srid as an author to AnnotatedList given his contributions to the discussion.