Simplified unit filtering conditions.
Treat 'all' filter explicitly.