Fixed completeness bug on redirect and hierarchy