Adding stage search. Fixes #1