Preview search fixes

These bugfixes are to go straight to preview once reviewed!