Fix flagging invalid ranks
Index name usage issues in solr