Improved search for substances and atc codes
Fixed small issues here and there