[IMP] better placing of project_id field