Fixed search and working with DB
Merge remote-tracking branch 'origin/master'