This MR fixes #105 (closed) by implementing the various bug fixes and feature requests inside.
Changed search layout: