Bug fixes including uploading catch and feed sorting