Extract search mapping to concerns #173