station finder improvement