Fix in booking search
Cleanup booking code