A bunch of field clean-up for db constraint matches, db functionality improved