Update default value functionality due to issue reports