opendata FIXUP Needs work for custom looking logic