Fix auth logic
Fix entry fetch logic