Some fixes to Expressions and FilterBuilder