AI-563 Ensures that admin entities get filtered by database