Stupid
Made the datasource / filters sections dynamic