Add NullInsertingPipe to handle optional matches