other search proposals and code dry-up

Signed-off-by: Zeljko <zeljko@zwr.fi>