Intelligence bill also an anti-terror catchall