Added a little code for search query preprocessing and removed unnecessary commented code