Fixes the fix for trips#update. Also now uses regexp to match sample destinations for friendlier matching.