Topic: search tool improvements