Allow to scan via controller as well.
Fix issues with scanning messages via controller.