Consistently use tuples in v2 API mapping and allow additional filters