Fix a broken pragma and speed up search test by using the key
Merge in dev