added non list lookups
missed one lookup
Merge pull request #1088 from wasade/issue_1087

added non list lookups