search alg improved, user search implemented