Fixed the drop down with units
Fixed the spaghetti bug
A message is now shown when no results are found