Tourist.Server EntityForm bugs corrected