Fixes to SearchBroadener