Unique redis keys for API gets
Fix edge cases with calculations