UOLD-12 updating POST statement, small code refactoring