increase the paranoia of the entity parser to avoid broken entities. This fixes issue #62
fix all remaining broken entities wrt B/E TEMPLATE mechanism