Fix capabilities indexing for services