Sure, but there's probably no incentive for legislatures to implement this fix. The loophole enriches their constituent law enforcement organizations, while also relaxing their budgetary needs. And most private citizens probably aren't going to care much either way, especially since the loophole can be framed as pro-law and order.
So if the law as written is encouraging abusive behavior from law enforcement, and the legislative incentives are misaligned to prevent the easy fix, how else could it get fixed?