improve lookup server behaviour#13401

rullzer merged 2 commits intomasternextcloud/server:masterfrom

improve-lookup-server-behaviournextcloud/server:improve-lookup-server-behaviourCopy head branch name to clipboard