arrange includeQueryMap