Minor - fixing PHP warnings
Fixing orphan questions bugs see BT#5854