Fix logical error in search
Enhance search for better results
Added in comments for search
Merge remote-tracking branch 'origin/search_logic'