More Heroku rejigging
Reorganised the hydration callback for clarity
Limit matching search results (to 10 by default)