Search almost integrated with db
Some bug fixing. Search just has Location to fix