added Enabled to block updates before all is ready
added fallback for COUNT not supported
speedup