Expression refactoring. Fixed expressions with nested document fields
Fixed filter aggregation