Put search back

Accidentally got rid of it
Enabled updating the database on change in server data
Merge remote-tracking branch 'upstream/master'
Renaming variables