Status and manual retrieval logic fixes