Added parsing of filter expressions