new fixes for load form