Even more variables renamed and login procedure prepared for filter