First attempt at fixing WebApp sub app issue