Move search options into build index