More deduping, no key_and_manifest in old fsm

Am starting to see some queries now where the two FSMs return different
numbers of results. Need to investigate to see where this was
introduced.