Restructuring search on asset and working on search