WEBAPP: removing more hardcoded urls