Revert "- Fixed query execution bug.  Query now executes prior to mapping."

This reverts commit b6f05a89b46bc7ec232368420c24903db594bbca.