Improvements to subscription checking & ip lookups