Story 47877509: fixing related controls