indexed to ydn-db fixes