fixed query bug

Rental cars wasn't joined correctly. Now it's correct
cleaning up for submission

TODO: remove unneeded comments
submit the project