Fix macro searching