Regression from 9b49c1b65

Accidentally made make snapshot not work anymore
Pass Placeholder to SimpleSearch

This requires 43f534acd from 4.0-trunk which will be in 4.0.20