Added sensible deletion of facilities
Added new sample search parameters