Adds more ideas of improvements

+ search engine -> query anwsering