Fix for calling/entry assembly for searching builders