UC-1914 Include group lookup fix