error 'filtering' in main_callback and fix the field buffer (non hack-ish way)

Change-Id: I7eb83fef67a4e0ed5f146c431c6c0b80425be5cc