Fix index view which does not work with --singular