Fixes to index features without analyzing properties