(feat) add filter by scheduled for entities resolver and adapt code as per review