Added search options and search step abort