Query Change for Null User
Final Touches for Beta