Slight refactor to macro storage
Progress bar for search