Return find query as dicitonary, update comments.