More friends/guild LDB refinements. Adjusted to 5.4.2 changes