Fix/station id handling