Scan - fixes

* UI fix
* automerger fix