updates to law mode query, still broken though