Remove filtering and ordering
Simplify field names
Next iteration of Bendigo config