Fixes for search in distribution