Added query fields to list method