Improved performance for cases where a single expression is used for multiple fields. Also improved demo