reverted mutator
mapping returns null if no mapping
further improvements on Query + unit tests