added quick fixes to expando forms