Added empty macro dir graceful degradation
Added special handling for all-empty topic