Prep work for BP 1.7

Also corrects some oddities with Q and A FAQ manager plugin.