Made querying flow better