Minor spellcheck in nc.notus.dao.* and improvements in GenericDAOImpl
Fixed conflicts