modules and content templates fix