Bugfix: incorrect DB field names used