Add queryable layers for vbs