Filter and expressions added