Cleaned up target filtering