added missing decoding
complete rework of behaviour, added manual search fixes #2