Minor tweaks and maintenance

# What's new?

 * Better integration tests for search (old ones did not catch some minor issues)
 * Minor tweaks to CropSearchController

# What's Next?

 * Still want to get test coverage a bit higher before moving forward with any new features (we've had a fair share of bloopers this week)
 * Still need to fix some TODO items
 * Guide photo uploads.
Space inside { missing.<br>Space inside } missing.