Fixes #272 Search SQL Error
Preparing 1.6.15
Merge remote-tracking branch 'upstream/feature' into fix-611-feature