basic support for subscripted and constant fields
upgrade a few more bundle filters