Fix for bug in filter elements, removal of overhead from variables