add js back and fix sorting of next stops