Check for presence of 'extra' before filtering

Partial-bug: #1272322
Change-Id: I5d7add21a126012386235ee453350f61937cb2f6