Added option to filter by goals with numerical values