added facility search and bugfixes