updated field names

updated field names to work without joined tables