Dont use asset type in queries

Remove unnecessary passing and handling of the asset type id parameter.