Fix backend option search logic

Change-Id: Iceb6da95033f4a52ac642cb9e15e9d8a5bc9f662
Merge "Fix backend option search logic" into production