Fixed bug with different field names in DB...