ensure that DB enum check is done only once

this commit will need to be rebased
ensure that bad annotation check is done only once