Fixed use of wrong index query in the Converter