Too many tipped arrows in the "Combat" section of the creative inventory

In the "Combat" section of the creative inventory there several tipped arrows that shouldn't be there:

• Tipped Arrow (awkward/empty/thick/mundane potion) 4 times
• Arrow of splashing (water bottle) which has no effect
• Non-extended effect versions of every regular effect shouldn't be there either, after all it's the same for enchanted books: There's protection IV, but no III, II or I