search refactor for assets