Further small tweaks
Fix bug with editing instance
Fix a couple of issues with the new instance form
Fix bug with searching after editing existing entry