Fixed database, added basic search