Database search and some features added