Fix regex
Add next station information