Fixed Issue: Combining FBA and GDBB under one menu

resolved issues with GDBB tree