removed scope, added query from, adjusted admin_query_helper