Fix search options.. continued