Doing the admin page query much more cleanly