Re #34 - Renamed the query token `@flow` with `@null`