Use separate schemas for each content type
Add year filters, refactor queries
Year filter is still commented out of the query,
since the test DB is currently storing dates as strings.