Removed query for only active sensors (can result in issues)