Bug fix for search
Merge pull request #15 from SamLau95/bugfix

Bug fix for search
Fixed merge issues