#35 - Clear the input box and leave it blank after a search; minor fixes and refactoring