(#548) - allow simple map function to .query

Implement #548, with two tests