Content Uploads: Adding indexing and error checking