-Cleaned Solution
-Fixed Filter by replacing the foreach that went outside the collection limit with a for
Thanks MrTryHardBro for pointing that out for me

Signed-off-by: Haraken <ltart.stephane@gmail.com>