Merge "(bug 41292) Fix "containing..." search option"