New mapping for multiple categories query