More tweaks to make the legacy creation logic work within the context of a more efficient set of queries (Formhub is not easy)