while classic ones default to "false", easiest thing to do here
is to simply only query for their value if enabled

Change-Id: I5b01d344a5310b9bbd8d59e9c53bef1a6bfee1ce