Readded leader/search macro