changes on querys and admin added