WK-265 @comment Fix for Organize Columns working only every other time.