Added Argument resolver for Content objects.

Removed CannedQueryHelper.