[BUGFIX] Retrieve correct fieldname for condition lookup