Facility search ready + minor changes