POM clean up.
Restores stop id search.