Fixes issue #145

Most likely breaks expiration filter tests (but since expiration filter broke the api not terribly concerned and we can discuss best way to fix this.)