This fixes #23 search form