Some refactorisation. WIP Fixing show and search methods.