Simplifying queries, removing need for arror operator