Fix typo
Fix invalid service name
Extract JS in a dedicated script