Fix to Dictionary search
New version