Dashboard courier improvements

Fixes #2266 

Also prevents more search requests from being triggered than necessary during init.