Updated field filters to include the key inside the filter.

This fixes a potential issue when a field is called the same name as a field type. e.g. "repeater"

Signed-off-by: Elliot Condon <e@elliotcondon.com>