adding expire_at to content and scopes
fixing or query on published