Fixed builder bug, id was not getting set, add logging to filter