Refactor asset api, add query by id