Commit No. 19 - Search engine bug fix
Commit No. 19 - Search engine bug fix