Use DataField.random in place of (potentially) slow query

Signed-off-by: Don Naegely <naegelyd@gmail.com>
Merge pull request #185 from cbmi/issue-182

Use DataField.random in place of (potentially) slow query
Merge branch 'master' into issue-186-dev