more stuff for no-index handling
0.1.8