add component_id and language to RDE and swapped the order of date expre...

...ssion and type