Fixed MCPD: added type in tags where needed.