Fix field name filtering to handle cases where db_name varies from model fieldname