added module_id on content output