Uploads, searches, consistency and stuff

All the things :-)