Fixes #1074 - Only call findAll once if argument is a deferred

Addresses #1074