Cleaned up and fixed transmit filters for structured data.

Change-Id: I7e5c55259159752882c8ae056e08f9bec12b3c02