Added singluar conditional to index