Fixed with force, bugfixes for filterning and removal of menu