Tool Labs: moar urlproxy tweaks

Change-Id: I8b3c7c1fcbe9e01e1fd91f67fad6e5a310aacd31