Code reformatted to repair some indention issues.
Added stateful expressions to expression filter ("t.*" fields) (AISAB-102)