[ ! ] EmptyCollection and Search bug fixes