merge movie & tv agents; support ID override