initial work on refactoring asset search