Use sequencial filter ID to preserve user order
Fix screen query and filter weekly before daily
Add screen indicators to security page