neflix WA: Search explicity for type 6 before deciding to bail out

Change-Id: I38990d69438f77c58e3e54b73dd9b80536e47c8e