Commit No. 5 - Search engine modifications and bug fixes