Optimized

Changed to a new dictionary structure which allows query words better,.
but lower speed...