Allow collecting with period queries

Allow the combination of `period=week|month` and `collect=whatever`