Fixed bad form counting + Fixed canAddForm not returing expected results