Changes according to discussion:...

...
https://github.com/enviroCar/enviroCar-server/pull/195#discussion_r14128939