Fixed target categories to only include mapping targets