Some Changes made in query and Super Admin