some cleanup + uncrashable by empty result-set.

- added ability to call without a map
- added a test