Only add non-compete filter when necessary
Simplify the check for hits, and do not include _index in returned results