adding in_progress state in queries and using resolution