Added a check for verification before querying