Add missing result warning and more discrimination to match click events.
Add missing result warning and more discrimination to match click events.

cjungmann/schemafw,cjungmann/schemafw,cjungmann/schemafw,cjungmann/schemafw,cjungmann/schemafw