Only stop listening to search events once search complete

Don't stop listening to all locator events as that stops the current
location GPS function working.
Fixes #80.
Return to details extra page from submit page as appropriate

Fixes #82