Added query for getting V1 asset number
Simple refactorings