Refactoring on Explorer and Search stuff