Staion list and Map fixes