follow-up and bugfix for 'cgi-bin' on labs

Change-Id: I3e0148041bde7ce3bea9fb636e57c8f95fe457f7