Check primary features not stored features in Constructor

Just in case someone finds their way around previous safegaruds
23 jobs for master in 60 minutes and 10 seconds (queued for 3 seconds)