added field type filtering