PLAYGROUND-250, theme query put in the mapper
Merge pull request #8 from fozeek/qdeneuve-feat-thememapperquery-PLAYGROUND-250

Playground 250, Put theme query in the mapper