Fixes #34. Persist search