From reading it, in my opinion it addresses those concerns. As with all legislation, it's the functionality behind it in communication between, say, police and their service providers that may show us the challenges, but in terms of legislation I couldn't find anything to enhance it.
On October 23rd, 2009. See this statement in context.