Test added for negative search
Refactoring of excluded buckets filtering