Simplify queryable logic on server