Works on filter form bundle reliability and make it much more standalone