ADD dump tool
FIX no search results for query with BOM