Change algorithm of headline
Remove warnings