Updating queries and trimming JS fat