Fix and debug
Merge branch 'search_simon' of github.com:agozarlavista/tricycle into search_simon