Fix preview handling issue
Fix issue on auth validation