Fixed toggling extra form for somewhere else in where dialog (still needs some work)