more forms based on mode... fixes #5219