Tweaks to data extraction

* Filtering out stop times not in the specified service