Fixes #5230

Virology areas were a bit of a mess, probably from all the relocations back and forth.
Attempts to arrange the setup as intended and adds missing APC.