minor enhancements on the database