some minor bug fixes

Change-Id: I82b72b59d659e6791142b5e9dc578dcaaa581b21
Signed-off-by: Matthias Steiner <matthias.steiner@inscope.net>
URL patterns updated 

Change-Id: I3c5dc2e04a1bb89a6f1e9aa7da2cf01516c83e44
Signed-off-by: Matthias Steiner <matthias.steiner@inscope.net>