more swish indexing fixes