Added FindWithQuery