If I were going to craft such an amendment, I'd probably make a distinction between active monitoring and passive monitoring and require reasonable suspicion to switch to active.

If I go shoot up a theatre, the police would allowed to put an active trace on me and query their database.

They wouldn't be allowed to just search for drug users by investigating who goes near drug corners.