Add ?and/?or multi-level query support