s: issue #11. search added