Added code to trim the entity offsets as well as the slot fill offsets and to output them
Changed order of filters