Include match type (ODI, test & t20) in filter expansion