modify database search
Merge https://github.com/ggeorgiou2/BSGTeam