correct displaying of the targeted messages
Merge branch 'pr889'