Display false handling

Merge to master