Add save_on_top in admin panel
Remove unused queries