WIP Vehicle Search
Fix merge conflicts