removed references to query active
reduced the timeout to 0.5s