Database template, feature generator bugfix