Cleanup on widget-filtered, ready to add Directory Link generation