Fixes #1818 - Gii excess forms

Fixes #1818 - Gii excess forms