new tags for custom module, fixes to other fragments