my suggestion was just to rewrite the line 573 in 
else if ( field.equals(titleField) ) {
so to remove the check in line 577 and 582 and make more evident that the else block is only to manage the untitled use case (as noted in comment).
It is not strictly required, so if you not agree please go ahead and merge the PR as it is. Instead if you are going to make the change please apply it also to the ItemListTag L538 (542 and 547)