Modified so only specific searches work for each dialog
Merged changes