Fix bus stop creation by scoping events