Added status to query on add/update