Initial booking fixes: removed recursive calls