DB call fixes, comment list improves