Move search into std bs3 header