Public freebusy fix crash WIP

Please don't merge this pull request as it is a WIP
I just seek for review and test